Revision: bazaar--merge--1.1--patch-9
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Sun Dec 12 10:32:32 EST 2004
Standard-date: 2004-12-11 23:32:32 GMT
Renamed-files: commands/star-merge.c commands/merge.c
    commands/star-merge.h commands/merge.h
    tests/test-star-merge.sh tests/test-merge.sh
Modified-files: commands/cmds.c commands/merge.c
    commands/merge.h libarch/star-merge.c
    libawk/associative.c libawk/associative.h
    tests/Makefile.in
    tests/jane-and-foo-do-hello-world-1-baz.sh
    tests/jane-and-foo-do-hello-world-1.sh
    tests/jane-and-foo-do-hello-world-2.sh
    tests/test-merge.sh tests/test-tag.sh
    tests/test-tree-version.sh
New-patches: robert.collins@canonical.com--general/bazaar--merge--1.1--patch-9
Summary: rename star-merge to merge
Keywords: 

